From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Tue, 2 Oct 2012 22:21:28 +0000 (-0300)
Subject: ctrlAltTab: Only set the stage focus mode when we're focusing a widget
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5682
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a171e92e6c4781fbeb7c90af7c1f71ccd42e807e;p=gnome-shell.git

ctrlAltTab: Only set the stage focus mode when we're focusing a widget

This ensures that we don't accidentally lose focus when switching to
the message tray.

https://bugzilla.gnome.org/show_bug.cgi?id=684633
---

diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index bd9bb1452..0519c9900 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -54,16 +54,17 @@ const CtrlAltTabManager = new Lang.Class({
     },
 
     focusGroup: function(item) {
-        if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
-            global.stage_input_mode == Shell.StageInputMode.NORMAL)
-            global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
-
-        if (item.window)
+        if (item.window) {
             Main.activateWindow(item.window);
-        else if (item.focusCallback)
+        } else if (item.focusCallback) {
             item.focusCallback();
-        else
+        } else {
+            if (global.stage_input_mode == Shell.StageInputMode.NONREACTIVE ||
+                global.stage_input_mode == Shell.StageInputMode.NORMAL)
+                global.set_stage_input_mode(Shell.StageInputMode.FOCUSED);
+
             item.root.navigate_focus(null, Gtk.DirectionType.TAB_FORWARD, false);
+        }
     },
 
     // Sort the items into a consistent order; panel first, tray last,